PV-on-HVM: Fixes for module loading.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
index e462d5333bc1bdbbe3504474592ffd8b36150f05..b63ddecfd0e3c1ce021d0643eb8dc9595cdc2eab 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
@@ -617,7 +617,6 @@ int __devinit gnttab_init(void)
        gnttab_free_count = nr_init_grefs - NR_RESERVED_ENTRIES;
        gnttab_free_head  = NR_RESERVED_ENTRIES;
 
-       printk("Grant table initialized\n");
        return 0;
 
  ini_nomem:

diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
index 83730569990dec4fe28cbd73704213114ca9ccc2..64bd7ca3ea76351d4a81bda085dc99149251a69a 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
@@ -67,7 +67,7 @@ static int alloc_xen_irq(void)
 
        spin_lock(&irq_alloc_lock);
 
-       for (irq = 0; irq < ARRAY_SIZE(irq_evtchn); irq++) {
+       for (irq = 1; irq < ARRAY_SIZE(irq_evtchn); irq++) {
                if (irq_evtchn[irq].inuse) 
                        continue;
                irq_evtchn[irq].inuse = 1;

diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
index 574b1187549d01d681996ac86390fbcf1bb4e650..2b35c5c757bf3facbbf3551904afda23b9a9d781 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
@@ -12,11 +12,10 @@ static int system_state = 1;
 EXPORT_SYMBOL(system_state);
 #endif
 
-static inline void ctrl_alt_del(void)
+void ctrl_alt_del(void)
 {
        kill_proc(1, SIGINT, 1); /* interrupt init */
 }
-EXPORT_SYMBOL(ctrl_alt_del);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
 size_t strcspn(const char *s, const char *reject)